Merge commit 'EMACS_23_2' into deb/emacs23/d/sid/upstream
authorRob Browning <rlb@defaultvalue.org>
Sat, 8 May 2010 03:28:33 +0000 (22:28 -0500)
committerRob Browning <rlb@defaultvalue.org>
Sat, 8 May 2010 03:28:33 +0000 (22:28 -0500)

Trivial merge